From: Maxim Ermilov <zaspire@rambler.ru>
Date: Mon, 11 Oct 2010 14:37:21 +0000 (+0400)
Subject: [ShellAppSystem] Don't use g_desktop_app_info_new
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~9666
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bd250e188b345cd4f4c6a90602b1dfed250bcff2;p=gnome-shell.git

[ShellAppSystem] Don't use g_desktop_app_info_new

It doesn't fully support convert id to path. For example: multiply
subdirs, "LegacyDir prefix" in .menu files...
https://bugzilla.gnome.org/show_bug.cgi?id=614879
---

diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 3fce1326b..3bfca45aa 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -1311,7 +1311,6 @@ shell_app_info_launch_full (ShellAppInfo *info,
                             GError      **error)
 {
   GDesktopAppInfo *gapp;
-  char *filename;
   GdkAppLaunchContext *context;
   gboolean ret;
   ShellGlobal *global;
@@ -1333,11 +1332,13 @@ shell_app_info_launch_full (ShellAppInfo *info,
     }
   else if (info->type == SHELL_APP_INFO_TYPE_ENTRY)
     {
-      gapp = g_desktop_app_info_new (shell_app_info_get_id (info));
+      /* Can't use g_desktop_app_info_new, see bug 614879 */
+      const char *filename = gmenu_tree_entry_get_desktop_file_path ((GMenuTreeEntry *)info->entry);
+      gapp = g_desktop_app_info_new_from_filename (filename);
     }
   else
     {
-      filename = shell_app_info_get_desktop_file_path (info);
+      char *filename = shell_app_info_get_desktop_file_path (info);
       gapp = g_desktop_app_info_new_from_filename (filename);
       g_free (filename);
     }